apm821xx: refresh 6.12 kernel config

Some symbols changed.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18798
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/apm821xx/config-6.12 b/target/linux/apm821xx/config-6.12
index a9c9a952c8c50b6da531c5759eaff68c7013327f..a06934a2f572205f39b75d1b82e20c1a246a3fc4 100644 (file)
--- a/target/linux/apm821xx/config-6.12
+++ b/target/linux/apm821xx/config-6.12
@@ -1,9 +1,7 @@
-# CONFIG_40x is not set
 # CONFIG_440_CPU is not set
 CONFIG_44x=y
 CONFIG_464_CPU=y
 CONFIG_4xx=y
-CONFIG_4xx_SOC=y
 # CONFIG_ADVANCED_OPTIONS is not set
 CONFIG_APM821xx=y
 # CONFIG_APOLLO3G is not set
@@ -21,6 +19,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_PKEY_BITS=5
 CONFIG_ARCH_SPLIT_ARG64=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -31,7 +30,6 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLUESTONE=y
 CONFIG_BOOKE=y
-CONFIG_BOOKE_OR_40x=y
 CONFIG_BOOKE_WDT=y
 # CONFIG_CANYONLANDS is not set
 CONFIG_CLONE_BACKWARDS=y
@@ -44,7 +42,11 @@ CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_MITIGATIONS=y
 CONFIG_CRC16=y
 CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
@@ -61,6 +63,7 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_OF=y
 CONFIG_DTC=y
 CONFIG_DW_DMAC=y
@@ -77,7 +80,8 @@ CONFIG_FORCE_NR_CPUS=y
 CONFIG_FORCE_PCI=y
 # CONFIG_FSL_LBC is not set
 CONFIG_FS_IOMAP=y
-CONFIG_FUNCTION_ALIGNMENT=0
+CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
@@ -124,6 +128,7 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
 CONFIG_IBM_EMAC_TAH=y
 CONFIG_IBM_EMAC_TXB=128
 # CONFIG_ICON is not set
+# CONFIG_IDPF is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
@@ -149,6 +154,7 @@ CONFIG_MIGRATION=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_GATHER_PAGE_SIZE=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
+CONFIG_MODULES_SIZE=1
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -227,11 +233,9 @@ CONFIG_PPC_KUAP=y
 # CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_PPC_KUEP=y
 CONFIG_PPC_MMU_NOHASH=y
-CONFIG_PPC_PAGE_SHIFT=12
 # CONFIG_PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT is not set
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_WERROR=y
-CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PTE_64BIT=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_RAINIER is not set
@@ -265,6 +269,7 @@ CONFIG_TINY_SRCU=y
 # CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_VDSO32=y
+CONFIG_VDSO_GETRANDOM=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 # CONFIG_WARP is not set

diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default
index fdd5bf8bbd7602d4474699f91db43862a86452eb..97d9b5f40b160713306c314b1c42296eec7661c9 100644 (file)
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@@ -1,43 +1,52 @@
 CONFIG_APOLLO3G=y
 CONFIG_ATA=y
-CONFIG_ATA_BMDMA=y
-CONFIG_ATA_SFF=y
+CONFIG_BCM_NET_PHYLIB=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_MQ_STACKING=y
 CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BROADCOM_PHY=y
+CONFIG_BUFFER_HEAD=y
+CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_MD5_PPC=y
 CONFIG_CRYPTO_SHA1_PPC=y
++# CONFIG_DM_CRYPT is not set
++# CONFIG_DM_INIT is not set
++# CONFIG_DM_MIRROR is not set
++# CONFIG_DM_SNAPSHOT is not set
 CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_FREEZER=y
+CONFIG_FS_MBCACHE=y
 CONFIG_FW_CACHE=y
+CONFIG_GLOB=y
 CONFIG_GPIO_74XX_MMIO=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_JBD2=y
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_MD=y
 CONFIG_MD_AUTODETECT=y
 # CONFIG_MD_LINEAR is not set
-# CONFIG_MD_MULTIPATH is not set
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 # CONFIG_MD_RAID10 is not set
 # CONFIG_MD_RAID456 is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_PHYSMAP=y
+CONFIG_NLS=y
+CONFIG_PCIE_PME=y
 CONFIG_PM=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_CLK=y
 CONFIG_PM_SLEEP=y
-# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PPC4xx_CPM=y
 CONFIG_PPC_EARLY_DEBUG=y
 # CONFIG_PPC_EARLY_DEBUG_16550 is not set
 CONFIG_PPC_EARLY_DEBUG_44x=y
@@ -46,10 +55,11 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
 # CONFIG_PPC_EARLY_DEBUG_MEMCONS is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SATA_DWC=y
-# CONFIG_SATA_DWC_DEBUG is not set
-# CONFIG_SATA_DWC_OLD_DMA is not set
+CONFIG_SATA_HOST=y
 CONFIG_SATA_PMP=y
 CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=y
+CONFIG_SG_POOL=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_USB=y